merge new upstream and resolve according conflicts

diff --cc dcmnet/libsrc/dstorscu.cc
index c93f175698a1b77215b89425c0ebb02ef5d663c9,4cd7acf6f0530fde2f30b97c2cb41e88226ae152..a8863fb1c9b4129d90a66c5569eec1845983ba17
--- 1/dcmnet/libsrc/dstorscu.cc
--- 2/dcmnet/libsrc/dstorscu.cc
+++ b/dcmnet/libsrc/dstorscu.cc
@@@ -927,10 -927,8 +927,10 @@@ OFCondition DcmStorageSCU::sendSOPInsta
  }
  
  
- void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry &transferEntry)
+ void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry & /*transferEntry*/)
  {
 +    // avoid compiler warning
 +    (void)transferEntry;
      // do nothing in the default implementation
  }